Merge pull request #92 from clairtonluz/master

improvements and bugs fixed