Update with 4b52fb01, close #53.