close issues #13