Better vcr support closes #101