Added licensing information, updated README
Added licensing information, updated README
Merge branch 'develop'