Merge pull request #8 from Julianus101112771/master

Merge
Merge pull request #18 from Putri2011/master

Merge pull D