Fixed and updated pull req