Merge pull request #79 from californiavol/master

merge from master
added embed action and view
Merge pull request #81 from californiavol/macbook-branch

Macbook branch