Merge pull request #17 from LeniHadianti/master

error merging -______________-