And more
Merge pull request #39 from RyuuTDF/develop

And more