minor bug fixes also in Christmas time!
Happy Christmas to all the ShineISP supporters
Merge pull request #318 from shinesoftware/sandbox

minor bug fixes also in Christmas time!