Merge pull request #296 from FWAJL/dev

dev to feature