Fixed a null pointer
Merge branch 'time8' of github.com:Orego/Orego into time8