Merge pull request #10 from mpeuster/master