update all... fix all
Merge pull request #2 from turtlepod/beta

update all... fix all