Merge pull request #11 from geppettodivacin/develop

merged in the penalty window