added echo flag to doShortcode