Merge pull request #177 from guestisp/master

Sync and Test the Guestisp code
fixed minor bugs
fixed minor bugs
Start new plugin architecture