Fixes #21
Refactored runs, fixes #25