Enhancements implemented to close issues #4, #5, #6 and #8.  Closes #4, closes #5, closes #6 and closes #8.