Merge pull request #2 from jfelient/2.0

2.0