Zach Hudson
merged pending pull requests #rc