Issue 3

Adds Issue #3 feature. It depends in Issue #4 features.