Merge pull request #46 from FWAJL/Development

Development for v1.0.5.1