Propose PR solving issues #97 and #98

[PrieJos]

Proposed solutions to the following issues opened by myself:

• Issue #97
• Issue #98

Linting and test checks are all passed after modifications.

Please take a look and hope you can merge them upstream.

Thanks Jose M. Prieto