Merge pull request #13 from FWAJL/master

Master to DEV