another update to issue #308
Merge branch 'fix308'
merged updated to fix308 and fixed tab space discrep