working.
Merge pull request #10 from rbkloss/ricardo

working.