Added Jon Chan as a contributor