[Fix #47] Clean up external interface.
Merge pull request #48 from benbjohnson/47-external-interface-cleanup

[Fix #47] Clean up external interface.