Merge pull request #9 from FWAJL/master

Merge master to DEV
Merge pull request #10 from FWAJL/Development

Merge pull request #9 from FWAJL/master