Bugfix.
Merge pull request #15 from steverc/HUBWH-6-uiImprovement6

Bugfix.