Improved requirements from Jesse
Merge remote-tracking branch 'origin/master' into carnes