merged optigraph changes and fixed test and binary scripts