Issue #1 : Test and fix bugs.