Added contains function
fixing compiling issues
Updating
Updating
Updating
Updating
Updating
No more compilation issues
Updating
Merge