Compatibility with 1.7.2, and minor bug fixes
Merge pull request #71 from msummers123/master

Compatibility with 1.7.2, and minor bug fixes