Implemented suggestions by @bsipocz
Improvements to docstring suggested by @cdeil