Added suggestions from github