Trying to make the API more compatible with orig.
Merge pull request #1 from surjikal/patch-2

Trying to make the API more compatible with orig.