Merge pull request #194 from jix/autotune_rst_fixes