Thai General says martial law to go soon