Merge pull request #520 from bariscelik/master