Fix bug
Merge pull request #41 from guestisp/master

Sync and Test the Guestisp code