new stuff
Merge pull request #3 from Pouncealot/master

new stuff