ISSUE-61 plus minus
Merge branch 'master' of https://github.com/OLIMEX/WPC