incorporated edits to 0.5.0