Merge pull request #191 from mnencia/patch-1