trial 2
Merge pull request #40 from jvbata/master

trial 2