Convert tabs to spaces
Code refactor and cleanup, removed unnecessary imports
README corrections and cleanup
Merge pull request #1 from mandx/master

Code refactor/cleanup