New bins + license

Please check and verify that it is still working fine after the merge.
Don't have the time at the moment.