merge master and fixed } error
Merge pull request #160 from 121watts/tabs

merge master and fixed } error