Merge pull request #54 from Dima73/tuner