hinals mistakes corrected
Merge branch 'issue-10' into pusheo