Small changes following the pull #2.