Merge conflicts.
Merge pull request #9 from pickhardt/huwr-master

huwr-master without merge conflict