Fix github #149
Fix github #150 by adding a settings parameter
Fix #149 on github
Merge pull request #156 from guestisp/master

Sync and Test the Guestisp code