small fixes
foo
Merge branch 'master' of https://github.com/oakfang/karma