Merge pull request #644 from Cadair/master

Forward-port 0.3.2 updates into master
Fix a bug in the HMI source