EOL spaces removed
char* changed to const char* to remove warnings