change to be more flexible
add savi hcat migration
Merge branch 'master' of https://github.com/danhan/hcat-savi