Merge pull request #337 from elskwid/patch-1