pull changes from bullsfirst
Merge pull request #25 from bobholt/updatesFromBullsfirst

pull changes from bullsfirst