Merge pull request #7 from charity-inifinity/development

Development
Merge pull request #8 from charity-inifinity/development

Development
Merge pull request #9 from charity-inifinity/master

Development