Merge pull request #43 from wshafer/master

Fixes Tab Display and Updates Repo to latest code base for Core
Added more unit tests and fixed minor bugs