3---
add vulcan.py
merge to vulcan.py
merge dev to master