Fixed bugs
Merge branch 'master' of https://github.com/themyth92/FYP