Fix XP bar and OS X build update
Merge pull request #12 from penguinflyer5234/xp-fix-plus-osx

Fix XP bar and OS X build update
Convert to C++
Convert to C++