Final setup commit
Merge pull request #1 from RyuuTDF/develop

Final setup commit