Merge pull request #792 from a-krebs/patch-1

fix to issue #696