Merge pull request #209 from shinesoftware/master

Merging the code to the ShineISP