Fixed problems.
Merge pull request #7 from The-TTP-Project/JezzaBranch

Fixed problems.