Merge pull request #47 from kmblake/Eric-other-changes

Eric other changes
Merge branch 'master' into Eric-other-changes