latest working
Merge pull request #4 from hariadi/develop

latest working