Merge pull request #1 from davidmoten/master

Update with DaveMoten last commits