did some new features
merged origin/master and add a new feature