Merge pull request #10 from ryayak1460/master

Check for addresses first.  Renamed several variables to elucidate their...