Merge pull request #197 from pzinn/master

fix for #196