Initial Commit
Added License
Merge with existing master