Merge pull request #186 from maksimov/2014.05

Removed the duplicate method definition
Merge pull request #187 from maksimov/2014.05

Deprecations sweep.