Do not have extra line break at the end of wiki link
Fix error in the sql
Merge pull request #494 from timschofield/develop

Develop