Merge pull request #1 from mrcupid12/master

Merge
Merge pull request #2 from mrcupid12/master

Update 4/4 9:21
Update 04/04 11:35 by K

- Fix some bugs
Merge pull request #32 from kelvinlee93/master

Update 04/04 11:35 by K