merge from master
add iframe
Merge pull request #23 from juniwang/dev

Dev