Upgrade rework to 0.18.1
Merge pull request #4 from iamdustan/update-rework-0.18.1

Upgrade rework to 0.18.1