first attempt at #7
Fixes for issue #7
General cleanup
More cleanup for #7
Merge pull request #8 from POSSA/working

Update master to 0.0.5