Implemented @cdeil’s comments
Fix first example in docs