Self review #1

Open
rob wants to merge 12 commits from dev into master

12 Commits