Fixed a bug from data not having faction info.

This fixes #1.
Merge branch 'master' into develop