Fix return statement of cid-scanning method.
Update company form of organization in setup.py.