continue change behavior closes #159
continue change behavior small edits
add merge