Now working on v3.0.2
Merge pull request #39 from wpreul/v3

Now working on v3.0.2