updated with additional options and a bit of cleanup
updated readme