Fix infinite loading.
Merge branch 'master' of github.com:graphitemaster/neothyne