Merge pull request #1 from benedmunds/2

update