Merge pull request #11 from aschlapsi/master