Added Bugs

Added Bug #5 and #6