Fixed #264
Merge pull request #265 from Nyholm/issue-264

Fixed #264