Final commit before bumping version to 1.1