Merge pull request #19 from jpecht/master

update
Merge remote-tracking branch 'upstream/master'
search results now appear in iframe