:triumph: Now without compilation errors.
Merge pull request #189 from maksimov/2014.05

Now without compilation errors.