2014-8-18 final commit