Bug fix #21
Merge pull request #28 from glorilla/PR21

Bug fix #21