Fix
Merge pull request #6 from mrcupid12/master

Fix
Merge pull request #40 from kelvinlee93/master

Fix