Merge pull request #6 from creighton/master

testing stuff