Merge pull request #158 from jix/autotune