Merge pull request #1 from musalbas/master

merge