Bill things
Bill put updates
Merge pull request #150 from heierj/develop

Bill put stuff