merging master with updated test + docs