Update 0.14
Merge branches 'master' and 'update'