Bugfix for API
Merge pull request #214 from SharadGandhi/master

Bugfix for API