bistros updated
Merge pull request #25 from bistros/master

bistros updated