Resync DEV branch
Merge pull request #19 from FWAJL/Development

Resync DEV branch