Initial commit
Merged files from original github repo