Merge branch 'develop'
Merge branch 'develop'
Added LICENSE file
Added check for "host" variable
Merge branch 'master' into develop