merge develop and master branches, set version 1.1