Develop

Refactoring according to #116