Updated to include all fixes in V00-22-XX.
Merge pull request #18 from ktf/V00-21-XX

Updated to include all fixes in V00-22-XX.