Changes for issue #34.

Replaced all tabs with spaces to fix issues with indentation. Other related minor fixes.