Merge pull request #56 from FWAJL/Development

Development
Merge pull request #57 from FWAJL/master

Merge pull request #56 from FWAJL/Development