stuff
some more changes
Merge pull request #3 from tschannes/master

Master