Small backwards-compatible changes to API
Merge pull request #342 from Atheros1/master

Small backwards-compatible changes to API