Merge pull request #203 from mpeuster/master