20141022 - Updates to Branch 2