Conclusao do issue #24.