v1r1p2
Merge pull request #23 from zimmerst/pre-v1r1p3

v1r1p2