Merge pull request #5 from athos-ribeiro/devel

Partial fix for issue #2
Refactoring