Merge pull request #3 from lucashaley/master

get new stuff
delete unnecessary stuff
Merge pull request #9 from nichmack/master

delete unnecessary stuff