Fixed Eknori's issue #30 Also created test package for Eknori so he can
contribute more tests if he so chooses. :-)

Signed-off-by: Nathan T Freeman <nathan.freeman@redpilldevelopment.com>