Fixed crashing where phone will blowup
Merge pull request #2 from djfitz/bug/newbranch

Rebase change