#6 Corrected errors from issues #4, #5 and #6