update from library 2014-12-07