Merge branch 'release/1.3.0' into develop
Rewriting internals.
Get rid of junk.
Update Tests.
Update dependencies
Merge branch 'release/2.0.0'