fork
version bump and some fixes