signal handler included, bug fixing