some change

some change
Merge remote-tracking branch 'origin/master' into N's-work
Merge pull request #31 from delihiros/N's-work

URL change