Merge pull request #72 from FWAJL/Development

Development
Merge pull request #73 from FWAJL/Development

Development
Merge pull request #74 from FWAJL/master

Master to DEV