add a check for pool id since it can come from two places
swap order
version bump
Merge pull request #42 from tstmedia/pool-tweaks

Pool tweaks