Fix issue 307

fix for issue #307 
tabs everywhere
![buzz](http://cdn.meme.am/images/300x/8619102.jpg)