Added support for custom parameters, some minor clean up and comments.
Fixed use of deprecated methods where Capabilities should be used instead.
:lipstick: Fixed a left-over unused import
Merge pull request #52 from maksimov/develop

Develop