Merge pull request #50 from FWAJL/Development

Development
Merge pull request #51 from FWAJL/master

Merge pull request #50 from FWAJL/Development