fixing #408
fixing #397 again.
fix for #381 squashed/cleaned.
Merge pull request #409 from crawljax/fix408

fixing #408
Merge pull request #410 from crawljax/fix381cleaned

fix for #381 squashed and cleaned.
Merge pull request #411 from crawljax/fix397

fix for  #397
Merge remote-tracking branch 'origin/master' into crawljax-4.0