Rudimentary fix
Merge pull request #1 from fhalim/develop

Rudimentary fix