stuff
Merge pull request #64 from mierze/master

stuff