Corrected issues #4 and #5