Updated to v1.2
Merge branch 'master' of https://github.com/Jdc1197/weblock