close #1054
Merge pull request #1055 from puniverse/master

close #1054