Updated to follow Github conventions