bug fixed
merged bug fix
add feature vulcan