bugs fixed and methods updated.
Merge pull request #11596 from dolphinSuPixnet/master

bugs fixed and methods updated.