Merge Develop

This would be version 1.0, but the bug #68 is a blocker. In the meanwhile the functionality can be tested.