THE-FYP Merge pull request #1 from imring/master