Final commit
Merge pull request #41 from RyuuTDF/develop

Final commit