Merge remote-tracking branch 'origin/SkyPHP3'
Merge pull request #263 from cjemagid/master

Merge remote-tracking branch 'origin/SkyPHP3'