Updated from ProjectA
Merge pull request #1 from hansoln/fromProjectA

Updated from ProjectA