Initial commit v.2
Merged v.2 into Master