Issue #7 #4 fixed