Update 12/04 23:20 by K
Merged 12/04 form K by C
Merge pull request #36 from mrcupid12/kelvinlee93-master

Kelvinlee93 master