Merge pull request #6 from AlexStorm1313/master

merge
Merge pull request #7 from AlexStorm1313/development

Merge pull request #6 from AlexStorm1313/master