close #2
Merge branch 'develop' of https://github.com/blivesta/test into develop