Fixed Manifest and some minor bugs
Merge pull request #81 from cchan5/master

Fixed Manifest and some minor bugs