Merge pull request #13 from Zodsmar/master

Merge pull request #12 from Zodsmar/development
Merge pull request #14 from Zodsmar/development

Merge pull request #13 from Zodsmar/master