Merge pull request #127 from cordoval/master

first digging