Merge pull request #145 from Dima73/tuner