Merge pull request #42 from FWAJL/Development

Development for v1.0.4.7
Merge pull request #43 from FWAJL/master

Merge pull request #42 from FWAJL/Development