Fix for issue #2. Code cleaned.