Merge pull request #43 from kelvinlee93/master

merged 13/04 17:48 by K
Update 14/04 8:13 by C
fix
Merge pull request #10 from mrcupid12/master

A