fixed crashing, what does it do?
Merge pull request #2 from CamdenSegal/master

No more crashing!