Merge Victor Kim's work from SpaceTraderFX to master