Merge pull request #34 from FWAJL/Development

Development