Merge pull request #9 from scaperoth/master

Get update
Begin catching speeder, doesnt work well yet:
Merge pull request #6 from awp1121/master

merge from awp