some improvement
Merge pull request #3 from luridarmawan/development

some improvement
Merge pull request #4 from fastplaz/development

some improvement
Merge pull request #1 from fastplaz/master

synch from master fastplaz