Merge pull request #15 from FWAJL/master

Master to DEV
Merge pull request #16 from FWAJL/Development

Merge pull request #15 from FWAJL/master