Merge pull request #11 from FWAJL/master

Master to DEV