Solves issue #239
Refactored solution to issue #239
Fix typo and remove '''try'''
Merge branch 'master' into issue_239
Changelog
Merge pull request #240 from collective/issue_239

closes #239