updated from sources 2013/04/21