Updated - 16/3/2014

conducted 50%
Merge pull request #5 from mrcupid12/MrCupid

Updated - 16/3/2014