Merge pull request #29 from FWAJL/Development

Merge pull request #28 from FWAJL/master
Merge pull request #30 from FWAJL/master

Merge pull request #29 from FWAJL/Development