Updated dev branch from 1.1 to 1.2