Merge pull request #1 from jafyvilla/master

hwsd completion