update URL to use ssl
Remove toplevel `if' form to suppress the warning,
fix typo
Merge branch 'develop'