Merge pull request #3 from ignazioc/new_feature_3

fix on feature 3
Merge branch 'master' of github.com:ignazioc/test_pull_request_1 into new_feature_4