issue26, some code cleanup to avoid notice messages
issue26, some code cleanup to avoid notice messages

unki/MasterShaper,unki/MasterShaper,unki/MasterShaper,unki/MasterShaper,unki/MasterShaper,unki/MasterShaper