License and Bug fix