fix https, issue #19
Merge branch 'mcguffin-master'