Merge pull request #1 from munchery/master

Support https image URLs via protocol option
Update parameters
Fix or/|| issue
Merge remote-tracking branch 'upstream/master'