ex1 in coursera.org
Merge branch 'master' into develop