Update from pioneer

Closes #17