Merge pull request #44 from FWAJL/Development

Development
Merge pull request #45 from FWAJL/master

Merge pull request #44 from FWAJL/Development