Merge in pyomx changes, and update seek function