Fix header
Small change to prevent null pointer exception
Fix headers and license
Move version 2.1.0 to the trunk