Merge pull request #15 from FWAJL/master

Master to DEV