Changed versioning
Added our own copyright information
Merge branch 'develop'