Got ride of camel case in function names and included ifndefs in header files
Fixed some memory leaks