Cleanup.
Merge pull request #26 from alxdarksage/develop

Cleanup.