Merge pull request #41 from kelvinlee93/master

T
Merge pull request #42 from kelvinlee93/master

Update 13/04 16:32 by K
Update 13/04 4:34 by C
Update 13/4 5:47 by C
Merge pull request #9 from mrcupid12/master

A