Last changes
Merge pull request #27 from Jacin/master

Last changes