small fix to close #13 and close #12