Changed the location of where CRVAL/CRPIX is pulled from.
Merge remote-tracking branch 'origin/track' into track