Issue 2

This should solve the issue adding minimal code and also provides test coverage.

Let me know your thoughts.