Merge pull request #8 from oberstet/master

stuff