Fixes crash with client, asteroid prototype related crash
Merge branch 'master' of https://github.com/alvinlao/charm