More stuff
Merge pull request #37 from RyuuTDF/develop

More stuff