Updates to better handle TAB character (reverted from commit 94386a94c548bb6108b85b09a052b4313eb8de81)
Bug fixes