initial refactor
cleanup
merge
manipulation and docs
versions
update version
fix reset bug
cleanup
minor improvements
updated version
fix merge conflict