Moved to this repo from the forked one since I have more controll here and original repo is not maintained anymore