Fix Issue #9. Setting origination and destination, and adding locations into attributes.