Improving the performance of the AFAMAP algorithm for Non-Intrusive Load Monitoring