Change how to handle optionals for beta 5
Merge branch 'master' of github.com:ayanonagon/Polyglot