Merge pull request #6 from burkeholland/master

sync
Test Video
Failing Tests
Merge pull request #45 from fujiy/master

Tests