merged toolGui with master