Api changes

Closes #7 

@rcrichton if you could please review?
Again the `serialVersionUID` thing, but not important to change.