Cleanup
Merge pull request #103 from squix78/DevBranch

Cleanup