7ae9e59 Merge pull request #12 from pirelenito/master