Minor improvements, mostly style and deprecations
Merge pull request #268 from maksimov/develop

Minor improvements, mostly style and deprecations