Fixed style
1.0.21 CHANGELOG
Merge branch 'develop' into rails4