Merge nitrog7 updates in my fork