Merge pull request #49 from tweenk/internal_export

Partial export of internal changes.