Master

This should, I hope, be the merge of my dev edits into my master branch. Fingers crossed!