Merge pull request #66 from mpeuster/master