Fix

Fix
Merge pull request #13 from DKongHD/master

Fix