reapplying changes to fresh version
Merge pull request #29 from aleatorybug/continue

Start of Continue/Reset work