Updated to Moxie 0.7.1