first part of feature 03
Merge pull request #1 from fpezzato/feature03

first part of feature 03 merge!