close issues #7