Merge pull request #166 from mpeuster/master