Some small changes
Add makefileZero
add description
Merge conflicts
Modify description