fix #25
Merge pull request #41 from madepeople/hotfix_25

fix #25