Merge pull request #61 from FWAJL/Development

Development
Merge pull request #62 from FWAJL/master

Merge pull request #61 from FWAJL/Development