Merge pull request #13 from croath/master

do not throw exception if in the OPTIMIZE mode