some fixes to get it working
Merge pull request #1 from neniuideo/master

some fixes to get it working