Merge Jed's awesome work
Add thanks to Jed