Issue 161: add shodan export
Merge remote-tracking branch 'upstream/master'
Merge pull request #163 from nemobis/master

 	Issue 161: add shodan export