Merge dev branch and master

The interface is done, you may want to merge to master branch