Created by: vanwinkeljan
Re-submit of pull request and this time on the master branch
Fix for Issue #28 (closed)