Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of github.com:ulmic/nastachku into develop

* 'master' of github.com:ulmic/nastachku: