ISSUE-68 Text Formatting
Merge branch 'master' of https://github.com/OLIMEX/WPC