Dev branch

Merge for 0.4 update - Adds asteroid science