Starting coding
Merge origin/master