Merge pull request #14 from tp9/master

Cleanup
Merge remote-tracking branch 'upstream/master'
Merge pull request #16 from tp9/master

Change to 4 spaces
Merge remote-tracking branch 'upstream/master'
Fixed bugs in main.py