#125 Cleanup
Merged 'develop'.
#125 cleanup
#155 marked as closed.