Merge pull request #81 from FWAJL/Development

Development
Merge pull request #82 from FWAJL/Development

Development
Merge pull request #83 from FWAJL/master

Merge