Addresses issue #100

Note to developers working off of net-next: you will need to locally
disable this patch to make use of the new features.
Signed-off-by: Brenden Blanco <bblanco@plumgrid.com>