Cleaned up api
Merge pull request #114 from sgwill/dispose-disposable

Cleaned up api