Develop bill

Merged and now builds OK for me with ant and mvn. My changes are minor.