trial 3
Merge pull request #41 from jvbata/master

trial 3