major cleanup
Merge pull request #3 from axaxs/master

major cleanup