Merge pull request #1 from Lumensoft/11001

11001 into 11002
1st change in 11002
2nd Change
3rd Change
Merge pull request #2 from Lumensoft/11002

k