Merge pull request #54 from StefanoGagliardi/master