Merge pull request #2 from nursela/master

Merge pull request #1 from mustikaulina/master