Updated Code.
Merge branch 'master' of https://github.com/Derekioh/Summer-Research-2014