Merge pull request #41 from dalexj/alex

Alex