changes from JM

[Todos] Closed issue #24