Allow user to specify options file
Minor fixes related to CUTSDP
performance improvements
Merge branch 'upstream/develop'