Adding ability to define options, updating readme, adding tests