Updated version + added better documentation