fixes
Merge branch 'develop' of https://github.com/antonshevchenko/pitch-in into develop