Fixed bug when it showed help link
Merge branch 'master'