Update to latest rework and bump version
Merge pull request #3 from danielhusar/master

Update to latest rework and bump version