Merge pull request #31 from FWAJL/Development

Merge pull request #30 from FWAJL/master
Merge pull request #32 from FWAJL/Development

Development
Merge pull request #33 from FWAJL/master

Master to DEV