Merge pull request #4 from maksimov/develop

2014.08 upgrade