Merge pull request #220 from FWAJL/dev

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

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

Issue #216
Merge pull request #229 from FWAJL/dev

Issue #216
Merge pull request #234 from FWAJL/dev

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

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

Issue #240
Merge pull request #243 from FWAJL/dev

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

No Issue Identified
Merge branch 'dev'
Merge pull request #256 from FWAJL/master

Master