Merge pull request #68 from FWAJL/master

Merge pull request #67 from FWAJL/Development
Merge pull request #69 from FWAJL/Development

Merge pull request #68 from FWAJL/master