replaced README with README.md; modified manpage; added tests for new options