Merge pull request #2 from ulvmoen/master

Small bug fix