Fixes for #28 / #29 

Hi There,

I've fixed 28 and 29.  Also this has some PEP-8 Cleanup.  This also has some basic tests.