Make it easy to setup dev environment
Merge branch 'dev-env'