v2.0.0: Work like described!

v2.0.0: Work like described!