changed a lot of stuff
Merge pull request #8 from decatan/master

changed a lot of stuff