merged octaveResearch branch