fixes #241
replaced some tabs with spaces
Merge branch 'master' into av