Merge pull request #167 from esainane/patch-1