Cleaned out unused variables
Added license
Merge branch 'dev'