Final commit for v.1 (minor fixes). Now on to v.2!