Merge pull request #56 from Dima73/tuner