fixes issue #336

fixes issue #336
Merge pull request #337 from chris18890/https-fix

fixes issue #336
Merge branch 'dev' of https://github.com/elplatt/seltzer into farset-dev