Update dev branch to latest

Includes Fix of an Environment bug that prevented an octave wrapper to behave properly.