Fixes for compliance with karma => 0.11
Merge pull request #3 from avalon12/master

Fixes for compliance with karma => 0.11