Fixed issue #235
Merge pull request #245 from Nyholm/issue-235

Fixed issue #235