Update links and defaults
Merge pull request #2 from jd1pinoy/patch-1

Update links and defaults