Merge pull request #38 from FWAJL/Development

Development
Merge pull request #39 from FWAJL/master

Merge pull request #38 from FWAJL/Development