uniformize
Merge pull request #1206 from grandoc/develop

uniformize