Get changes from pveller's fork