Fixed issue #214, #236 and #243
Merge pull request #244 from Nyholm/issue-236

Fixed issue #214, #236 and #243