Fixed #8 and resolved #7, new release