add /usr/bin/env
Merge branch 'dev'