v2.0.0
Merge pull request #84 from tsherif/2.0.0

v2.0.0