fix
fix
Merge branch 'master' of https://github.com/mwalus/resttouch into develop_0.3
working on refactoring