Merge pull request #245 from mpeuster/master