Bug Fix

Bug Fix and Version Update