fixes #96
Merge branch 'master' into sharpnk_issue96

resolve conflicts
Merge pull request #240 from sharpnk/sharpnk_issue96

fixes #96