Merge pull request #18 from mmattioli/master

Tab Spacing Update for PEP8
fixed off-by-one indent bug
Merge pull request #9 from psychomario/master

update from original