Merge pull request #2 from benedmunds/2

update