add changes from 2014-04-03