Merge pull request #5 from distanlo/one

Merge pull request #3 from distanlo/two