Kevin's changes and mine

This should pull in Kevin's improvements (bumping version to 1.1) as well as my changes.