Added all Ver_048 changes
Merge pull request #1 from atyger/Branch_048

Added all Ver_048 changes