Merge pull request #10 from mrcupid12/master

A
Update 17/04
Merge pull request #44 from kelvinlee93/master

A