Fork of the official repository with some fixes