Added missing dependency (nobody was providing it)
Fix headers and license
Move version 2.1.0 to the trunk