Modified as mentioned on github