committing changes
Merge pull request #4 from vianneyd/master

committing changes