added lodash
merge develop