Merge pull request #3 from Itseez/2.4