Merge pull request #87 from Nesta/patch-1