fix merge
Merge pull request #99 from ksslng/develop-fix

Fix Merge