Now should avoid adding itself as dependency to a library
Merge branch 'dont_add_self_library'