Add objects and several small changes #800

Closed fcvalise closed 7 years ago