Merge pull request #12 from talves/master

 Change tab Handler