add development environment on olorin
Merge branch 'master' into static-link

* master:
  add development environment on olorin
get working on darwin