fixes due to 31 avg sprint
Merge branch 'master' of github.com:Grapheme/Universiality