added tests and made some of options, optional
bumped version