Fixed #131
Merge branch 'master' of https://github.com/unplugged/unplugged-controls into v1.2.0