version 2
Merge pull request #2 from mariontan/master

version 2