Code review: 192750043: Minor bug fix, issue #73 and #74