added interrput singals handling
merge fix