merged in from mvaganov/unity

didn't have write access to CoderDojoSV earlier, so I worked on my own
branch. Merging back into the main branch now.