Bonomi Issue 8 Complete

Bonomi Issue 8 Complete