Updated API to be more similar to pre-0.2.0
Release 0.2.1