Merge pull request #53 from FWAJL/master

Merge
Merge pull request #54 from FWAJL/Development

Merge pull request #53 from FWAJL/master