Some cleanup
Merge pull request #97 from nurupo/master

Some cleanup