Merge pull request #13 from FWAJL/master

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

Merge pull request #13 from FWAJL/master