Merging pull request #9 making api into longs