fix issue 3 and update combined JS