Fixes #issue-900308

Getting the site info correctly
Fixes #issuecomment-49858988

Using Return Instead of echo