Implemented comments by @cdeil