Added META.json to MANIFEST
Fixed C89 issue
Postpone store_self a little