 diff -Naur wifiphisher/requirements.txt wifiphisher-fork/requirements.txt
 --- wifiphisher/requirements.txt	1970-01-01 00:00:00.000000000 +0000
-+++ wifiphisher-fork/requirements.txt	2016-05-04 16:09:40.643789000 +0000
++++ wifiphisher-fork/requirements.txt	2016-05-06 05:49:07.984809428 +0000
 @@ -0,0 +1,4 @@
 +argparse
 +logging
 +scapy
 +mock
 diff -Naur wifiphisher/wifiphisher/pywifiphisher.py wifiphisher-fork/wifiphisher/pywifiphisher.py
---- wifiphisher/wifiphisher/pywifiphisher.py	2016-05-04 18:57:39.163353950 +0000
-+++ wifiphisher-fork/wifiphisher/pywifiphisher.py	2016-05-04 20:29:21.459782000 +0000
-@@ -31,12 +31,12 @@
- def parse_args():
+--- wifiphisher/wifiphisher/pywifiphisher.py	2016-05-06 05:48:56.081475744 +0000
++++ wifiphisher-fork/wifiphisher/pywifiphisher.py	2016-05-06 05:55:30.654820833 +0000
+@@ -32,12 +32,6 @@
      # Create the arguments
      parser = argparse.ArgumentParser()
--    parser.add_argument(
+     parser.add_argument(
 -        "-c",
 -        "--channel",
 -        help="Choose the channel for monitoring. Default is channel 1",
 -        default="1"
 -    )
-+    # parser.add_argument(
-+    #     "-c",
-+    #     "--channel",
-+    #     help="Choose the channel for monitoring. Default is channel 1",
-+    #     default="1"
-+    # )
-     parser.add_argument(
+-    parser.add_argument(
          "-s",
          "--skip",
-@@ -99,11 +99,11 @@
+         help="Skip deauthing this MAC address. Example: -s 00:11:BB:33:44:AA"
+@@ -99,11 +93,6 @@
                "the access points and only send them to client/AP pairs"
                ),
          action='store_true')

+    APs = [[args.ap_ch, args.ap_essid, args.ap_bssid]]
+    channel, essid, ap_mac = APs[0]
+
+    # # Copy AP
+    # time.sleep(3)
+    # hop = Thread(target=channel_hop, args=(mon_iface,))
+    # hop.daemon = True
+    # hop.start()
+    # sniffing(mon_iface, targeting_cb)
+    # channel, essid, ap_mac = copy_AP()
+    # hop_daemon_running = False
 
     # get the correct template
     template = select_template(args.template)

 
 
 def dhcp_conf(interface):
@@ -739,6 +746,11 @@
     print "                      |_|                                "
     print "                                                         "
 
+    def raise_exception_sigint(self,signum, frame):
+        raise KeyboardInterrupt()
+    import signal
+    signal.signal(signal.SIGTERM, raise_exception_sigint)
+
     # Initialize a list to store the used interfaces
     used_interfaces = list()
 
@@ -789,7 +801,7 @@
             interfaces.IwconfigCmdError, interfaces.IfconfigCmdError) as err:
         print ("[{0}!{1}] " + str(err)).format(R, W)
         shutdown()
-
+    sys.stdout.flush()
     # add the selected interfaces to the used list
     used_interfaces = [mon_iface, ap_iface]
 
@@ -810,14 +822,11 @@
 
     print '[' + T + '*' + W + '] Cleared leases, started DHCP, set up iptables'
 
