Story and refactoring
Merge pull request #10 from ghirardinicola/master

Story and refactoring