Merge pull request #245 from dandv/patch-1