Merge pull request #13 from cujo/new_internal_api