Merge pull request #94 from njtaylor/master

Multiple updates