fixes #5, and adds all sorts of related options
resolved conflict