Added some new options and more unit tests. Almost ready for release.