Fixing MANIFEST
Merge remote-tracking branch 'origin/master'
Fixing console script