20131219 final commit