Added MANIFEST.in
Fixed package name
Small fixes
Merge branch 'master' into events