Merge pull request #6 from oconn/alex

Alex
merging conflicts again