Fixed issue #237
Merge pull request #246 from Nyholm/issue-237

Fixed issue #237