Merge pull request #25 from FWAJL/Development

Development
Merge pull request #26 from FWAJL/master

Merge pull request #25 from FWAJL/Development