add change
resolve conflit
add specs
merge with kenvifire-master