Redo ARP code
Merge pull request #10 from changbl/working

Redo ARP code