Fixed an issue with delete_entry being called multiple times.
Commented the configure.ac file and added whitespace for readability.
Merge branch 'master' into abstract

Retrieved the comments for configure.ac