More tests and bug fixes.
Version 0.0.6