Merge pull request #3 from dedrake/Ken

Ken
Merge branch 'master' into Adam