Merge pull request #124 from guestisp/master

Sync and Test the Guestisp code
Updated standard YML data
Merge branch 'shineisp/sandbox'