Updating manifest.  Issue #3 and Issue #4