Bill bug fix (3rd times the charm)
Merge pull request #147 from heierj/develop

Bill bug fix (3rd times the charm)