Branch 20121230 aj code lib