made the api awesome - fix issue #7