cleanup and ready for v1r1p3
Merge pull request #29 from zimmerst/pre-v1r1p3

cleanup and ready for v1r1p3