Merge pull request #64 from FWAJL/master

Merge pull request #63 from FWAJL/Development
Merge pull request #65 from FWAJL/Development

Merge pull request #64 from FWAJL/master