Merge pull request #243 from mpeuster/master