Merge pull request #48 from FWAJL/Development

Development for v1.0.5.2