update framework
update player
fix typo
update framework
Merge pull request #31 from dualface/devel

Merge from dualface:devel