Sync to pioneer, also closes #22

This will close #22