Merge pull request #17 from FWAJL/master

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

Merge pull request #17 from FWAJL/master