Minor Refactoring
Merge branch 'master' of git@github.com:tux-rampage/rampage-php.git