Made changes according to pull #71