issues #7 and #8 resolved

issues #7 and #8 resolved