This document presents a data fusion technique to improve the accuracy of wireless ranging. It analyzes the performance limitations of two common ranging techniques based on received signal strength and two-way time-of-flight measurements. A data fusion algorithm is proposed to combine the techniques. Testing of a prototype embedded system showed the approach improved ranging accuracy but was not precise enough for fine-grained indoor positioning. However, it could reliably detect hazard proximity. Integrating time-of-flight directly into radio chips was suggested to further boost accuracy.