Fix cmake files
Merge branch 'add_rank'

Conflicts:
	CMakeLists.txt
	tests/CMakeLists.txt