Initial commit
Added license
Merged with master