fixed #23
Merge branch 'develop' of https://github.com/korpling/pepper.git into develop