Merge pull request #40 from FWAJL/Development

Development