Merge pull request #115 from FWAJL/master

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

Merge pull request #115 from FWAJL/master