Merge pull request #144 from mpeuster/master