Little changes.
Merge pull request #31 from hacdias/master

Some changes.