merged in version 1.1 changes
merged in 1.1 deletions