Merge

Merged the open pull requests together to make for an easy pull