Updated and check in for version 1.1