This fixes #20 and #25

Moving in final testing before release