10.12 fix
Merge branch 'master' of https://github.com/CodeVillain/trial
merge
Merge branch 'master' of https://github.com/CodeVillain/trial