This fixes issue #62
Merge pull request #63 from maxtaco/issue_62

This fixes issue #62