Merge pull request #117 from FWAJL/master

Master to DEV