Merge pull request #328 from dongcarl/fine