Merge pull request #3 from RayoGundead/development

Merge pull request #1 from Midskiller/master
Merge pull request #5 from Midskiller/development

Merge pull request #3 from RayoGundead/development