Merge Master with Version 1.1