Fixed #15, Added testcase for #17, Bump ES to 1.3.5