Merge pull request #1 from seabiscuit29/develop

add two in feature
fix bug 001 by xw