Updating to 0.3.0
Updated annotated source