Fixed compilation issues with Phase III
Merge pull request #6 from johns4ta/master

Fixed compilation issues with Phase III