Merge pull request #212 from shinesoftware/master

Merging the code to the ShineISP
Merge pull request #213 from shinesoftware/sandbox

Merge pull request #212 from shinesoftware/master