9/25/14 - Daniel Essien
9/25/14 merge fix