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

Fixes #1
resolved conflict
Merge branch 'hw/issue-2' of https://github.com/pvaras/HelloWorld into hw/issue-2