Merge pull request #259 from Murdock01/master

revert of commit d970bd2