Merge pull request #1 from p2t2/DEV2.2

Dev2.2
Merge pull request #168 from apfeffer/DEV2.2

Merge pull request #1 from p2t2/DEV2.2