Merge pull request #5 from mpeuster/master