fix2
Merge pull request #8 from antoniputra/develop

fix2