Updated to reflect current github feedback.