fixed up crash errors.
Merge branch 'master' of https://github.com/uscar/software