A bunch of changes. Some refactoring. Adds #10. A lot more refactoring and rewriting to be done. Stared working on #11. Ready for a first BETA release.