Merge pull request #23 from dalexj/alex

Alex