fixes #140
fixes #154
version bump + docs + time disabled border corrected
conflict resolved
link fix