kikito Merge pull request #58 from jojo59516/optimize