Merge pull request #297 from FWAJL/dev

dev to feature