change 1402
Merge pull request #2 from ryangaraygay/branch_r1402

change 1402