Merge pull request #1 from ianphs/uitabbed

Uitabbed - refactor and Makefile for testing