pulling in bugfix from api-js
Merge pull request #42 from ordrin/dev_polina

pulling in bugfix from api-js