2014-8-21 final commit