Code cleanup
Code cleanup
Merge pull request #33 from cnaude/master

Merge