erorcun Merge pull request #678 from blingu/master