Added default constructor used by some tests, not sure why it worked before.
Added English units
Added package whitelist and default imports.
Merge remote-tracking branch 'origin/master'