cleanup
Merge pull request #80 from yogthos/master

code cleanup