new stuff
Merge pull request #3 from crash2720/master

new stuff