First version
Merging github repo with mine