Completed refactor.
Normalized whitespace handling
Version bump and README update.