add coding
merge & fix vulcan.py conflict