Bug-fixes - 10-07-16

Bug-fixes - 10-07-16