[Global] Closes #72