Added discrete option - closes #65 and closes #68