Fixes #1
Merge pull request #2 from pvaras/hw/issue-1

Fixes #1