Fix from merge.
Merge pull request #4 from rodkaroma117/develop

Fix from merge.