hour of reckoning!
Merge pull request #13 from rbkloss/ricardo

hour of reckoning!