Yeah, this is probably where the crash is.
Merge branch 'master' of github.com:ambivalentduck/psychicRobot