Merge cleanup branch into master #3

Merged
ruthenic merged 4 commits from cleanup into master 2 years ago