Added custom edits to v1.0.1 master