Merge pull request #1 from Tydax/development

Development
Merge pull request #2 from Kaendan/development

Merge pull request #1 from Tydax/development