Merge pull request #1 from mursino/master

updated portability by moving into a single file
Merge pull request #1 from markstiles/master

Changed a duplicate tab name