changes 2014-05-11
merged