fix issues 3 & 4, merge PR5, new release