Fix bugs, add 'each'
Merge
Merge