#22 added package name constraints
#22 fixed package name constraint failures