optcomp 1.5
Merge pull request #1347 from diml/master

optcomp 1.5