simple refactoring
Merge branch 'develop' of https://github.com/kaize/nastachku into develop