Merge pull request #1 from DaJobat/Development

Development
Merge pull request #2 from DaJobat/master

Merge pull request #1 from DaJobat/Development