Fix typos in fix for issue #46
Merge branch 'fix_issue_46' into running