Merge pull request #6 from ahfergus1/master

pull
btg
Fixed conflict.