FIXED: lots of small fixes
Merge pull request #14 from wakaDemo/master

FIXED: lots of small fixes