bla
Merge pull request #246 from sadasilva/master

Bla changes