Merge pull request #25 from dalexj/alex

Alex