optimizer returns correct results now! hopefully
Merge branch 'master' into sinatra