api changes
Merge pull request #36 from anilsaldhana/master

see comments