Commit into v1
Fixed a bug, ready to push to live