Fix some crashes
Fix double-free
Merge branch 'master' of github.com:cgutman/AndCast