Moved code
k
Merge pull request #33 from mpath/cleanup

Cleanup