Updated changes from 1.3.1