Merge pull request #155 from maksimov/2014.05

2014.05