Cleanup
Merge pull request #34 from RyuuTDF/develop

Cleanup