Merge pull request #36 from FWAJL/Development

Development
Merge pull request #37 from FWAJL/master

Merge pull request #36 from FWAJL/Development