Api changes

Closes #7 

@rcrichton if you could please review?
Cool, yeah I'm with you on using braces for single line statements. This was auto-generated Eclipse code.