Merge pull request #115 from FWAJL/master

Master to DEV