Minor enhancements #10 and #7. Resolved issues #11 and #9