Merge pull request #27 from FWAJL/Development

Development
Merge pull request #28 from FWAJL/master

Merge pull request #27 from FWAJL/Development