all existing code added
Merge pull request #1 from tomten/2.2

all existing 2.2 code added