Merging the code to the ShineISP Master