this is the commit to merge into the pull request
Merge pull request #1 from hknielsen/my-branch

a pull request