Merge pull request #274 from bolte-17/master

If I only had a brain...