Some cleanup
Merge pull request #8 from corebob/master

Some cleanup