pull request from john

Hi Avi, this is my 1st submit.