Merge pull request #44 from FWAJL/Development

Development