close #132, close #133, fix #137