OttaviaE Merge pull request #10 from danielskatz/patch-1