Merge pull request #36 from dalexj/alex

Alex