Merge branch 'development'
Updated README with license information.
Merge branch 'master' into development