Fixed some bugs.
Merge pull request #7 from jack3vt/Runner

Fixed some bugs.