Merge geekz-patch-1