Merge pull request #1 from ziyasal/master

merge upstream