More changes.
Merge branch 'dev' of https://github.com/jpgg/Space-Dinosaurs into dev