Finished edits for version 0.5.0