wallyqs Merge pull request #78 from stig/patch-1