Fix bug when run_context is nil
Merge branch 'tduffield/rel-0.3.1'