update script for Neutrino
Merge branch 'master' into develop
fix for compiling on osx 10.6