V0.1.2. Tests added; minor tweaks