Merge pull request #77 from FWAJL/Development

Development
Merge pull request #78 from FWAJL/Development

Development
Merge pull request #79 from FWAJL/Development

Development
Merge pull request #80 from FWAJL/master

Master to DEV