Fixes for Bill
Merge pull request #1 from jfmatth/master

Fixes for Bill