Initial commit
Added license header
Merge remote-tracking branch 'origin/master'