Ghi 6

I have no clue how this should work, so I'm going to start with a pull request. 

Issue #6 
I would sort of prefer the abolishment of all tab chars in our code here... because tabs are evil and such.