Merge pull request #212 from apfeffer/master

Merge pull request #1 from p2t2/master
Merge pull request #2 from p2t2/DEV2.2.2

Merge pull request #212 from apfeffer/master