- Merged from mhgrove's repo