generalise
add licence info
Merge commit '1edb' into gen-table