Merge branch 'dev'
Merge pull request #207 from FWAJL/dev

dev to master
Merge pull request #209 from FWAJL/dev

Issue #201
Merge pull request #212 from FWAJL/dev

dev to master
Merge pull request #214 from FWAJL/dev

dev to master
Merge pull request #219 from FWAJL/master

Master