Merge pull request #34 from FWAJL/Development

Development
Merge pull request #35 from FWAJL/master

Merge pull request #34 from FWAJL/Development