Merge pull request #741 from rustyswayne/1.3.0

API fixes