Ignore the backup files
Minor changes
Merged changes from master manually in main.cpp only