Merge pull request #142 from mpeuster/master