Bill work and data cleanup
Merge branch 'master' of https://github.com/osmihi/Capstone