Some fixes
Merge pull request #107 from guestisp/master

Sync and Test the Guestisp code