Merge pull request #82 from maksimov/2013.07

2013.07