Bug #20

Fixing and Closing Bug #20