Some cleanup
Some cleanup
Merge pull request #19 from corebob/master

Some cleanup