Fix class/module missmatch
More class/module mismatch fixes
Bump version to 0.0.3
Merge remote-tracking branch 'upstream/master' into test-credentials