Merge pull request #50 from FWAJL/Development

Development