erorcun Merge pull request #695 from erorcun/master