add feature vulcan
merge dev