Merge pull request #111 from FWAJL/Development

Development
Merge pull request #112 from FWAJL/Development

Development
Merge pull request #113 from FWAJL/Development

Development
Merge pull request #114 from FWAJL/Development

Development
Merge pull request #115 from FWAJL/master

Master to DEV