#11 bug fix and add new func