Harmonizing coding style.
Merge branch 'gem_update'