rearrangements
Merge pull request #252 from cordoval/252-rearrangements

merge #252 rearrangements (cordoval)

This PR was merged into gushphp:master branch.

Discussion
----------



Commits
-------

d8212b7ae0dee17d3fb3a32c0b2d4bef04b40756 rearrangements (cordoval)