Merge branch 'master' into development
Unstable code
Merge branch 'development' of github.com:timekpr/clepsydra into development