Small changes to API (backwards compatible)
Merge pull request #362 from Atheros1/master

Small changes to API (backwards compatible)