Fixed #179
Merge pull request #255 from Nyholm/issue-179

Fixed #179