Changes suggested on Github