Merge pull request #9 from mpeuster/master