Objects support
Merge in object support, Closing PR#8, minor code cleanup