Merge pull request #212 from shinesoftware/master

Merging the code to the ShineISP