Merge properly now

@xiaomao5 merging was too hard: just readd that JQuery iteration