Develop pull request from meng

Fix #51