Merge develop and update to 1.1.0