Gsitter

rebased with master