fixing #1 and introducing $options