Merge pull request #1 from boie0025/development

Development
Merge pull request #3 from boie0025/master

Merge pull request #1 from boie0025/development