Bug Fix

-Fixed Issue #22
-Fixed Issue #21