Issue #8 closed. Bugs solved.