Merge pull request #1 from wellsm2011/master

Taco