merger
fixed bug with Matthew's awesome event delegation