Merge master to development

Make sure development branch reflects recent edits so i can start doing work there and submitting PRs like a normal person.