Sean's Edits, fixes #1

No need to bring this in.