Develop

Issue #17 closed