Updates for Jason
20141111 - Trying again to merge