Merge pull request #1 from InfinityHoldings/development

Development
Merge branch 'master' into development