Sync to pioneer, also closes #22