merge @whalesalad's latest changes into @marks' master